057b5b5df4c71ee912e9d30099b8af60150d5309,clc/modules/reporting/src/main/java/com/eucalyptus/reporting/art/renderer/InstanceRenderer.java,InstanceRenderer,addUsageCols,#Document#InstanceUsageArtEntity#Units#,170

Before Change


		doc.addValCol((long)entity.getInstanceCnt());
		doc.addValCol(UnitUtil.convertTime(entity.getDurationMs(), TimeUnit.MS, units.getTimeUnit()));
		doc.addValCol((entity.getCpuUtilizationMs()==null)?null:((double)entity.getCpuUtilizationMs()/(double)entity.getDurationMs()));
		doc.addValCol(UnitUtil.convertSize(entity.getNetInternalInMegs(), SizeUnit.MB, units.getSizeUnit()));
		doc.addValCol(UnitUtil.convertSize(entity.getNetInternalOutMegs(), SizeUnit.MB, units.getSizeUnit()));
		doc.addValCol(UnitUtil.convertSize(entity.getNetTotalInMegs(), SizeUnit.MB, units.getSizeUnit()));
		doc.addValCol(UnitUtil.convertSize(entity.getNetTotalOutMegs(), SizeUnit.MB, units.getSizeUnit()));

After Change


    doc.addValCol(UnitUtil.convertSize(entity.getNetTotalOutMegs(), SizeUnit.MB, units.getSizeUnit()));
    doc.addValCol(UnitUtil.convertSize(entity.getDiskReadMegs(), SizeUnit.MB, units.getSizeUnit()));
    doc.addValCol(UnitUtil.convertSize(entity.getDiskWriteMegs(), SizeUnit.MB, units.getSizeUnit()));
    doc.addValCol(entity.getDiskReadOps()==null?null:entity.getDiskReadOps()/(entity.getDurationMs()/1000));
    doc.addValCol(entity.getDiskWriteOps()==null?null:entity.getDiskWriteOps()/(entity.getDurationMs()/1000));
    doc.addValCol(UnitUtil.convertTime(entity.getDiskReadTime(), TimeUnit.MS, TimeUnit.SECS)); //TODO:STEVE: how should this be represented?
    doc.addValCol(UnitUtil.convertTime(entity.getDiskWriteTime(), TimeUnit.MS, TimeUnit.SECS));

    return doc;
  }